[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: d4ef92d866 -s ours
am: 04c0112766 -s ours
am skip reason: subject contains skip directive

Change-Id: I7a121920bcfbf44c17e4426a8a512039a7e449f2