[automerger skipped] Merge "Stop marking apps as privileged if they are not...

[automerger skipped] Merge "Stop marking apps as privileged if they are not signed properly." into tm-qpr-dev am: 68e32180 -s ours am: 6b2f043a -s ours

am skip reason: Merged-In I5b5b81cf43b06837a22c8dfd170a112106dd64c1 with SHA-1 e336c7d7 is already in history

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



Change-Id: I04faa288a5702bf5890bb7cb807f16a079cf0c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>