Merge "Do not restore auto-rotation setting when target device is a tablet"...

Merge "Do not restore auto-rotation setting when target device is a tablet" into tm-qpr-dev am: 4301af1a

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



Change-Id: Ia4daa79d4ee033fdb2bdebd35211d4bbf62d6188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>