Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev am: a56beb12 am: a204ce35 am: b3261539

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

Change-Id: I96b87745554aed829893b16e0c10ffc631be7c5b