Merge "Switch to standard naming scheme" am: c6bb075956

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

Change-Id: Ia37e8970ec00493cb8fe5ca67bbcce87157ca5a1