Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1dd3455a808aa2373270295ffbd9a01f1b4a1845