Merge "Revert^2 "API changes as requested by API council."" am: 0bd58c09b2

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

Change-Id: Ife6df3a74ced06c37b5b641beb768dd5bce2d67c