Snap for 8139767 from aeeec1d053940437b315a8e727f57b0f6e6e5076 to androidx-startup-release

Change-Id: I34f0ed4bcaa6b190ca4dd06b7126cafea053c39f