Merge "[Setting] Use @SystemApi to replace the hidden api"
am: e74208c831

Change-Id: If091c3ba75733da4cb8c509409c070de7e5c625d