[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 048a25a0e6 -s ours
am: d02c844385

Change-Id: Ie5cb9c99e0796f2bcb863eb4fe5887e520c68d67