Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev am: a56beb12 am: 7084489e am: 221a7776

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

Change-Id: I4ffdfd24507f433cd2a292199f283f1f63b6db2b