[automerger skipped] Merge "Switch to standard naming scheme" am: b04aea27 am: 71efd472 -s ours am: 3c013db3 -s ours

am skip reason: Change-Id I3b78fcbcacc3df787e171d6eedeef1e51b087615 with SHA-1 abebc6a8 is in history

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

Change-Id: I235e3873020d3166689b22b38d7a0863ecc5bd42