Merge "Merge "Create a shim for StatusBarManager click methods" into rvc-dev am: a01520b395 am: 6018d4055c" into rvc-d1-dev-plus-aosp