[automerger skipped] Migrate Settings to androidx.
am: a290b873d0
-s ours
Change-Id: I9ba23b9406f2f7397de78c86aa3eccf5be4fe22d
This commit is contained in:
am: a290b873d0
-s ours
Change-Id: I9ba23b9406f2f7397de78c86aa3eccf5be4fe22d