Merge "Revoke NLS permission if the last association has been removed" into...

Merge "Revoke NLS permission if the last association has been removed" into tm-dev am: 8f42965c am: 6f7a7989 am: b5f9ef91 am: b6b59740

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



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