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

Bug: 236760014
Merged-In: I546ac3bad491e4950d192f8b3f4a20bc3ff5534f
Change-Id: I150f5660e6f90f3bc545421318db1401e2fc47b8