Merge "Lint fixes for AppRestrictions sample." into nyc-mr1-dev am: c458c4b1 am: fcaa1853 am: 24a61353 am: 54fa196d Change-Id: Ib5f2e7f9990299dd1797f448f865e97712b9b9c2