[automerger skipped] Merge "s/enforece/enforce/" am: 271d82e966 am: fa9eca97b7 am: a2809aa39f -s ours

am skip reason: skip tag Change-Id I8559564a5a68fee4ed8b0543cc91ea3ca7dc36ee with SHA-1 41105e5721 is already in history

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

Change-Id: Ifb9eeac33e8bf354adf7ec582d12339c4994138d