[automerger skipped] Merge "Switch to standard naming scheme" am: c6bb0759...

[automerger skipped] Merge "Switch to standard naming scheme" am: c6bb0759 am: 9ab25e72 -s ours am: 75204a70 -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/+/1325812

Change-Id: I01fce61fd2e5913e3a3612932c46d013e795f7e3