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

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

Change-Id: Ic74545a5f0122eef314f098304aa906e067fc59a