Merge "Snap for 7955407 from be8a7617da8765fdcb3abe35d9f1578b1cc8d45a to androidx-localbroadcastmanager-release" into androidx-localbroadcastmanager-release