Merge "Merge "Fix getApplicationRestrictions documentation" into nyc-dev am: a86d6c4d am: 36ff488b" into nyc-mr1-dev-plus-aosp