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

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

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