Merge android10-release

Change-Id: Ife306d9e5b6d489172a47a55f3b0cd20aee4c40d