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

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

Change-Id: Ide1a12e8e7507383b4c233ff88a1a63590f0210e