Merge "Merge "Fix getApplicationRestrictions documentation" into nyc-dev am: a86d6c4df3 am: 36ff488bb4" into nyc-mr1-dev-plus-aosp