Merge "HULK SMASH! We've gotta declare REL." into sc-dev am: 2a75262a am: 8374bdcf am: bf72a10b

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

Change-Id: I1f7ca6e30a33e63310b821734b091d24e68aad17