Merge "Add pending messages to dumpsys" am: 803e3cd3af
am: e137040028

Change-Id: I5b716ef5d58b18039cf59ca5041f6289b87f66aa