Merge "Merge "Restore overlay change broadcast handler for secondary users"...

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 am: 869b772d

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

Change-Id: Iaa02fbf93bcb6fc4501c9f97c70f702e8cda739d