Merge changes from topic "compose-build-flag" into tm-qpr-dev am: 93df848c am: 3553ea8e

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



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