Use system API

Bug: 404593897
Test: N/A
Change-Id: I7f9d87bd99e4a1c034f435ed617c98703cd12234
5 files changed