[automerger skipped] Merge "Convert enableGwpAsan to @IntDef and rename to gwpAsanMode." into rvc-dev am: 21c6a0f598 am: dd795918ca -s ours am: 4df2139114 -s ours
am skip reason: Change-Id Ie33954700e1526f9764a751e474a3f930a65e957 with SHA-1 d43d109af8 is in history
Change-Id: Ib37664daed78b1703b4b6062484181951c99af97
This commit is contained in: