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

Bug: 236760014
Merged-In: I794bcb9e9c922c642c3fbf0808fb60de4445ab65
Change-Id: Id292c36692b0020d772dc61b863f9cd3b39fe0c5