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

Bug: 236760014
Merged-In: I641b445134f34cefa34f0e574c24a02b86624c95
Change-Id: Ia53fb82d62b9364fa77f97998b51c56cc1e1800f