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

Bug: 248070379
Merged-In: I461caeefb30d1e74608ac0f267ab0fe2705a2153
Change-Id: I4879766495572a8b9c6224fa3c96a887371c8ab8