[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 244dc17f49 -s ours
am: 5ac4c8b94f

Change-Id: I691b1c0c79a17e5474e1e4981c2c3a5307f79787