Merge "Merge "Pass displayId to onActivityRotation()" into rvc-dev am:...

Merge "Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b709 am: e5596e83 am: b7e0b85e" into rvc-qpr-dev-plus-aosp am: c3974592

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

Change-Id: I04e8f2e00e41d107a8ac9bcf50546a58c0aab15c