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

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

Change-Id: I685916f8933348bcbeab2fd20a81429edfbceeea