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

Bug: 264720040
Merged-In: If120447eeb76860d62903d6a0e83efc586f43686
Change-Id: I8f26934d683c4359f1b62fef205eee3f2b6537bc