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

Bug: 248070379
Merged-In: I4a45d361732bc7f21be3d9db108f52f664e5c949
Change-Id: I98c264c9f957dd99a19a00865a7311b2d50efc22