[automerger skipped] Watch uid proc state instead of importance for 1-time permissions am: 0be78fbb am: 2eb60508 -s ours am: 38f3e792 -s ours am: 946dbfce -s ours am: 77959b72 -s ours am: 4e343482 -s ours

am skip reason: Merged-In I7a725647c001062d1a76a82b680a02e3e2edcb03 with SHA-1 61864145 is already in history

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



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