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 am: 5624a766" into rvc-qpr-dev-plus-aosp am: 67ee46fc

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

Change-Id: I8e46ce3a291fecdab577aa22d1345e474b17303b