[automerger skipped] Migrate Settings to androidx.

am: b1af85d155  -s ours

Change-Id: I098cc300a217762bcb77bc1b0b5f6ee6bdbc56dd
This commit is contained in:
Aurimas Liutikas
2018-08-28 14:59:45 -07:00
committed by android-build-merger

Diff Content Not Available