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

Bug: 236760014
Merged-In: I19204b9f685c940887bdae9172eb892c69bf4441
Change-Id: Ibdfa9ba05da5701414ea99c4c3c47accb618fd96