Merge "Migrate Settings to androidx." into stage-aosp-master