[automerger skipped] Merge "Add implicit grants to NLSes" into tm-qpr-dev am: 7eee6e6b -s ours

am skip reason: Merged-In I8071d5a03515cc05cbd3f8598997e6236d306052 with SHA-1 534e6d5f is already in history

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



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