Merge "Move the AppRestrictionController dump out of the global AMS lock" into tm-dev