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

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

Change-Id: If583a420ba194e6a34e5f4757c17ba6bbaff2992