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

Bug: 248070379
Merged-In: I309f5fdb2088db1293a2278bc4a0518aa12b5601
Change-Id: I2b45fa3a80f13f47cb401184abf51896070388e2