[automerger skipped] Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: 52b816c77b -s ours

am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: Ia5f8015f33e5b8c423707124d4bcd6cb4252b750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>