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

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

Change-Id: Ic150540ae202d83ecb84ff58fe48e0b458c887f9