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

Bug: 236760014
Merged-In: I508f71895a7b9e1f243b3994f27a131d8da8adb6
Change-Id: I0bb5888e3c85cd0939387e35182182218b104b37