Merge "Do not skip restoring rotation lock when returning to home" into...

Merge "Do not skip restoring rotation lock when returning to home" into sc-v2-dev am: 49794ebb am: 669edf20

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

Change-Id: I8390ba655923f8a495d98b496e1b304e3bbbefe9