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