Merge "Update BridgePowerManager#userActivity to take Display ID" into sc-dev am: 678721b886

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I142e35bfb2a96b4391709aa1b4c281267935f7c0