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

Bug: 236760014
Merged-In: I837d7d2478523eae98a5e94d8f640ea04055e35a
Change-Id: If5645373f8b133febdd636bfcc2b9d411ff06e6b