Merge "Limited use key: feature files" am: 63e30d9a38 am: 1fb7c54d17

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4438ed503563c32951b752161418b0ccf10abecf