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

Bug: 236760014
Merged-In: I38fb23dcc85676593a3f8f0851676bc526802d2e
Change-Id: I077e6bd0ac2cdf53c93261d51a04eba9e1da79b0