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

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



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