Merge "Add explicit handling for an unspecified gwpAsanMode manifest flag." am: 95e227bf7b am: 2c8ed23591

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

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