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

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



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