Merge "Revert "API changes as requested by API council."" am: 6b4ecd94c1

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

Change-Id: I69e1d7a9f3d5733248262187298dd22d2242a1ad