Merge "Add limits to App Usage Observer Api" into pi-dev
am: 98fd4fa0f4

Change-Id: I79e58fa83b389bffeb5b286cbddbbfe15de17caf