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

Bug: 264720040
Merged-In: I0037f63e6c1f271962400ab9c1f6d98ef9593255
Change-Id: Ife4779676fe8de2275d3f7969dd20470fc693a9e