To align with current naming. Bug: 236346018 Test: Make Settings App Change-Id: I20b2423faf5ee433a530e6a963dd6bb3de33ba90
ba69fd0d3f
d5ab7dc729