[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master
am: 048f11d0a9  -s ours

Change-Id: I9aafcf6e8525db976ddb5ce29d53dd5bdf612d70