Merge "Merge "Small fixes for AppRestriction samples." into nyc-mr1-dev am: d7d387a2 am: e7cbb91e am: caba58a6" into nyc-mr2-dev-plus-aosp am: c43e5c03 Change-Id: Iff36ddfdfd03d8ee15482a284fbfba7ad153cd22