Merge "Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL.""""...

Merge "Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc4 am: 42b5526a" into sc-v2-dev-plus-aosp am: 9082eb0a

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

Change-Id: I77cf07340839c0ba83d7a025e40306c333ca6d91