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