[automerger skipped] Merge "Switch to standard naming scheme" am: c6bb075956 am: 9ab25e725e -s ours

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

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

Change-Id: I165b9840ac39d209338478cae05804a4929b711a