Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc am: 371eea87de

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I329a81911fd5a186e48a3aab8dab36b79f4515ec