Merge "Fix a security issue" into sc-v2-dev am: 509a29f8a0

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

Change-Id: I78fbe44a612e1a7ae7234367691b94d3680013e8