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