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

Merge "Merge "Workaround for back arrow being stuck on screen" into sc-dev am: db294649 am: 50293d4b" into sc-v2-dev-plus-aosp am: ebd17a97

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

Change-Id: I29059ac31437e0c87bdd56e63181f935a3f36d86