Merge "s/enforece/enforce/" am: 271d82e966 am: fa9eca97b7

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

Change-Id: I74171acabde4a219d89681b27b0780b8726f7e58