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

Change-Id: I9779621d46ba83975bcd552b7b36939d934110bf