Merge "API renaming asked by API Council" into stage-aosp-master am:...

Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086 am: cbb7188a am: d0bfa4c2 am: b08043a7

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

Change-Id: Ib8eab5d51218b81323df36dd866f685efb7c0d29