[automerger skipped] Merge "Revoke NLS permission if the last association has...

[automerger skipped] Merge "Revoke NLS permission if the last association has been removed" into tm-dev am: 8f42965c am: 6f7a7989 am: b5f9ef91 am: b6b59740 am: 3d72c55f am: 4a109e69 -s ours

am skip reason: Merged-In I09ac1ef07b65e5180d38e8697d4507a113162eb7 with SHA-1 a987e9d9 is already in history

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



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