Merge "Do not set user rotation from rotation callback when docked." into...

Merge "Do not set user rotation from rotation callback when docked." into tm-qpr-dev am: 97f604c6 am: 410478e2 am: 580c875e am: d95fda63

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



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