Merge "Fix notification permission for letterboxed activity" into tm-qpr-dev...

Merge "Fix notification permission for letterboxed activity" into tm-qpr-dev am: bab869ca am: a104d2e6

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



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