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