Merge "Handle the WatchRotation failed" into rvc-dev am: 8fdb8d4f34 am: e157da8558

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

Change-Id: I335c7e4a411984240e26c212b9944a490c508630