Android mainline 12.0.0 release 2
Snap for 7483611 from c71d1150318ddb8fe498d1867de977ee46af3d46 to mainline-documentsui-release

Change-Id: I181d49ba487d1738bb110bbc73919caeedc36034