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

Change-Id: I03f11783d5c6d3f38ea555763ba9242ecdffa05d