Merge "Add APP_AUTO_RESTRICTION_ENABLED" into pi-dev
am: 9aa32d0e71

Change-Id: I79ad9035fcbbf0935e547b518d5a937400aa2a4c