Merge "Change default value of AFAA flags to be on." into udc-dev am: 3d5ad7b9 am: 353b2782 am: 5914eb59 am: 337e7458

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



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