[automerger skipped] Switch to standard naming scheme am: 6e2418e276 am: 13e3dfa1e9 -s ours am: 5da3007444 -s ours

am skip reason: Change-Id I853f91cc86de7bb33f36ae79dff3c57a876ba67e with SHA-1 f668c088c2 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1325833

Change-Id: Id863a7a85f263f204379c81815680602c0bb860e