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

Bug: 236760014
Merged-In: I80438d19e9b8de648cc3129e9ace2337b56d1c24
Change-Id: Ie99217b449c7fe9e3b7e62f858de9f1068602fc3