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

Change-Id: I9adcfe2dfdc6613024c7bba754bd2543e392c556