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

Bug: 236760014
Merged-In: Ie6749dcf2adfe81d73d5553297a1a4244f9a1e9a
Change-Id: I554ebb2af4ffa1d49608f13fd2adc1696cc916da