Merge "The nav bar isn't restored when swiping an app up to home in landscape" into sc-dev am: cb10463a am: af2a792b

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

Change-Id: Ia8f539f08401c8943bdde9146dfbe3f70222fad7