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

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

Change-Id: If177e27d1e92740bf616bede073300e22db7e7d1