* Match AOSP settings provider Change-Id: I949bb7a3e748319a94f2029dac8a5beea6553635
issue-id: CYNGNOS-828 Change-Id: I01c08c0e432d6a941950a565e5ab6664664e2a7f