Merge "Merge "Small fixes for AppRestriction samples." into nyc-mr1-dev am: d7d387a2 am: e7cbb91e am: 453d7dfa" into nyc-mr2-dev-plus-aosp