[automerger skipped] Migrate Settings to androidx. am: b1af85d155
-s ours
am: 44593b7bac
-s ours
Change-Id: Ifc73b43625413bb89223875f99d8e0e99b9a2c91
This commit is contained in:
b1af85d155
-s ours
am: 44593b7bac
-s ours
Change-Id: Ifc73b43625413bb89223875f99d8e0e99b9a2c91