Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e

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

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