Merge "Assigns Ids to the internal rotation resolver callback." into sc-dev am: aa457f8a am: b8c7153a

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

Change-Id: I5e788befce89e906bf31a8a41d54df7465f3d6b9