Merge "Remove sole "user" of DCHECK_CONSTEXPR." am: 25be6e9109 am: 22558534ce

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1377807

Change-Id: Ia438f857a2fbd45c56e35cef864d3eba5913053c