Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master