Merge "Fix the DUMPSYS skip. am: 34222565fc am: 04bb08da3c" into nyc-mr1-dev-plus-aosp
am: ef5cefbfc4

* commit 'ef5cefbfc4a695924c69c213ac4d19ec4802cae4':

Change-Id: I619448499b204443c0fa03ee72ab90a94d4b78b3