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

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



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