[automerger skipped] Merge "Restrict automatic NLS revocation to specific...

[automerger skipped] Merge "Restrict automatic NLS revocation to specific device profiles." into udc-dev am: 6ef1b0f1 am: d7d8a3a7 am: 811a705a -s ours

am skip reason: Merged-In Icd3cdb3234a516ff7f752f39d7b1d8e6f5cde1ef with SHA-1 8ccb7103 is already in history

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



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