Merge "Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 38009196 am: 7f5ccdc2" into rvc-d1-dev-plus-aosp am: 5ab375f5

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

Change-Id: I0a499cec73473c81396cdf4eb2fd73884bc01e2d