[automerger skipped] Merge "Convert enableGwpAsan to @IntDef and rename to...
[automerger skipped] Merge "Convert enableGwpAsan to @IntDef and rename to gwpAsanMode." into rvc-dev am: 21c6a0f5 am: dd795918 -s ours
am skip reason: Change-Id Ie33954700e1526f9764a751e474a3f930a65e957 with SHA-1 d43d109a is in history
Change-Id: I4837919afbbc68f5f7c478714cff89d4aec0fda1