Merge tm-dev-plus-aosp-without-vendor@8763363

Bug: 236760014
Merged-In: I8cbb5dfb3d967e8a1e6c80dcc430770307a49b1d
Change-Id: I8d5a91f3ca7ae145e09860fe5aa0ab7c97da855c