[automerger skipped] Merge "Limited use key: feature files" am: 63e30d9a am:...

[automerger skipped] Merge "Limited use key: feature files" am: 63e30d9a am: 1fb7c54d am: c3040bbc -s ours am: eef9e4aa -s ours

am skip reason: Change-Id I33349c4f968fa7b16055acd3db2e0cb80c0c5df1 with SHA-1 0538ddc4 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1552236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafce8789c2c35d5f4fca4ea8005cdea1ca90ad8b