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

Change-Id: I74e57f9cd0fc051f4308df48535f3dce22f3908b