[automerger skipped] Merge "Added OnSetRequestedOrientation callback" into...

[automerger skipped] Merge "Added OnSetRequestedOrientation callback" into tm-qpr-dev am: d9f955a5 am: 3b819523 -s ours am: 701ab69c -s ours

am skip reason: Merged-In I4fe6ef7716398047a757a5c761f316f6145d00b6 with SHA-1 5052f015 is already in history

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



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