[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: c12771af1e -s ours
am: 80fcaa0568

Change-Id: Id696174708085ee239c234b7b341e735d3232396