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

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

Change-Id: Ic0076cdb9c39381977121463a364cd1253c9e681