Merge "replace constexp variables with inline constexp" into udc-dev am: 0a14359b

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



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