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

[automerger skipped] Merge "Restrict automatic NLS revocation to specific device profiles." into tm-dev am: 46bbe61b am: ddb7e2f1 am: 34d37a95 -s ours am: e4188667 -s ours am: 655f215e -s ours am: 44e94c11 -s ours

am skip reason: Merged-In Ie98a90b5cb3c040873a1d4b9b1159ba6ff0d6309 with SHA-1 8577610f is already in history

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



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