Merge "Split provider / service dumpsys into platform and non-platform" into pi-dev
am: aac69a551e

Change-Id: I48d51a78bbf6a3247a435c896f553ccc954fd554