[automerger skipped] Merge "s/enforece/enforce/" am: 271d82e9 am: fa9eca97 am: a2809aa3 -s ours am: f9ac9e61 -s ours

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

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

Change-Id: I6ce5e22ff4bae4b0b18a280696df29e77718e537