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

Bug: 248070379
Merged-In: I36eb223602fc67951adbe8d6dcd179db2a01476e
Change-Id: Icf0b03ab70e7d48bef7b9d1a4bd9e03a0430fddd