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

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

Change-Id: Ia9cc42abafcda07569ba216b74457db43b70f530