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

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

Change-Id: If9f9aae036070f0f49ff0f016fc164ad07a4ee00