[automerger skipped] Merge "Switch to standard naming scheme" am: b04aea2791 am: 5b8f3bede8 -s ours
am skip reason: Change-Id I3b78fcbcacc3df787e171d6eedeef1e51b087615 with SHA-1 6812c1b1ee is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322775
Change-Id: I7144b03a68a8cda1d1933dd021b22140482e4266
This commit is contained in: