Merge "Merge branch android10-qpr2-release" into android10-gsi