Merge "Do not use @SystemApi(client = MODULE_APPS) (documents/settings)" am: 9bf0c496df

Change-Id: Iadcd9db4717f1350621ce1565c1f79b75af5eced