Merge "Workaround for back arrow being stuck on screen" into sc-dev am: db294649 am: dcc6f0ea

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

Change-Id: Iae19da96c99e0185d6264dad7b2bfc208fbcbe44