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

Bug: 236760014
Merged-In: I1e00a1b506db818fec91a27065972268991d99bf
Change-Id: Ie5bf5613000b9fbccaadabec9bc59fe9943843c2