[automerger skipped] Merge "Add a new permission to install testOnly apps" am:...

[automerger skipped] Merge "Add a new permission to install testOnly apps" am: 71d89f5d am: bc7a7218 am: d4f1cb46 -s ours am: d4628137 -s ours

am skip reason: Merged-In I047a4013fb3462db3487eab2d1635ea75ae29264 with SHA-1 dead379e is already in history

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

Change-Id: Iacc49731c95046ed7373a046223dca36f8979c86