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

Bug: 248070379
Merged-In: I1a650df14a3fe49914025a02c70ee9728f32fb69
Change-Id: I9af0fb4012f7f563b34441cef697b708374f080b