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