[automerger skipped] Merge "Add enforcement parameter to RequiresFeature" am:...

[automerger skipped] Merge "Add enforcement parameter to RequiresFeature" am: dd438b73 am: 371eea87 am: 55193136 -s ours

am skip reason: Change-Id Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845 with SHA-1 5bfa4239 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacedffbb6da07e13e992cb907bfffeb8606c0c4c