[automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99  -s ours am: 2b0960c2d1  -s ours
am: 77d2f1f8ab  -s ours

Change-Id: Ic21b9bb2c530a19d07aaecaeaf273451288ebef1