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

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



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