[automerger skipped] Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc am: e459bcff5b am: 47acc27644 -s ours

am skip reason: Change-Id Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845 with SHA-1 64f53dc08f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacedffbb6da07e13e992cb907bfffeb8606c0c4c
tree: 71d862eabbf6ecae527d02670e8e8341926f85e1
  1. java/