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

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

am skip reason: Change-Id I0c31e2183353dfb5bd49f04f3455cb7b10be6866 with SHA-1 8b864fb4 is in history

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

Change-Id: I3f0a79e4d7059139047c24031438908d78995201