[automerger skipped] AMS: Add Phenotype key for proactive kills am: cb832469...

[automerger skipped] AMS: Add Phenotype key for proactive kills am: cb832469 am: 1a9b904c -s ours

am skip reason: Merged-In I173058d77e18294a882714591dcea96dae06c12f with SHA-1 b3be3d5b is already in history

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



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