[automerger skipped] Merge "Migrate Settings to androidx."

am: a544f17b99  -s ours

Change-Id: I507cbff22f0daa46c9aaac05646f23698f86d861
This commit is contained in:
Aurimas Liutikas
2018-08-29 12:00:24 -07:00
committed by android-build-merger

Diff Content Not Available