Merge "Small fixes for AppRestriction samples. am: 9804ffad am: 1cbba13f am: f95912a4" into nyc-mr2-dev-plus-aosp