Merge "Add METADATA to msm8960: GPL=RESTRICTED" am: 2aa4e417ed am: a303db56cb am: e83f58adeb

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/msm8960/+/1300193

Change-Id: Ia849a56e0a8592fc7522dd037d121d2ae27e30b4