Merge "Protect invalid entitlement app configuration" into rvc-dev am:...

Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb am: 29e59cf8 am: 070e090a am: c1c5aa7b

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

Change-Id: I46e9cc995a3b1fe9628f2487e969b87c2c2371c9