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

Bug: 236760014
Merged-In: I861f36d84fbf520b80f4f3a70d3651417606253d
Change-Id: I3d768967a94c76ed4eaad5a2776a30460fa48a0b