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

Bug: 236760014
Merged-In: Ib14589ac8bb5e56d4fb24d837f1721b49f2c5d55
Change-Id: Ida950e1580afa2ddf3099a5dda8dc300418cab83