Merge "Fix issue where back button causes shade to appear over bouncer." into...

Merge "Fix issue where back button causes shade to appear over bouncer." into tm-qpr-dev am: 1097ed3c

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



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