Merge "Enables flag for modern architecture in KBAV." into tm-qpr-dev am: aa8f8a95 am: 8e2ef9a7

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



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