Merge "Rename driver build time manifest flag." into rvc-dev-plus-aosp am: f2502dcd60 am: 5d8f13267b

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

Change-Id: I6605c265fe95c3a59473be8e8d7772a7d0df7b52