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

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

Change-Id: If69866ed8163315e67357b7c1d5d824bb27a3d06