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

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

Change-Id: I71986b15f00ba6f71ad46a2d4d763238fef1844a