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

Merge "Merge "Pass displayId to onActivityRotation()" into rvc-dev am: 2983b709 am: 73095787 am: e0ddf1d3" into rvc-qpr-dev-plus-aosp am: f709fd9f

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

Change-Id: I7107612fed72444fb71562e241fd8b6a08014dae