Snap for 7244831 from 1d3db4f3e9eafe2615387a84642f74da4e1d39f2 to androidx-main-release

Change-Id: I8c3d159bce0f72d21fe9ff92038f683e9b270da6