Merge tm-qpr-dev-plus-aosp-without-vendor@9467136

Bug: 264720040
Merged-In: I2fb61f9a6cf4d61753118c4bf9b381c890297b38
Change-Id: I68e787fc3161c7c4e867133dc87cdadf0df7c603