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