Merge "ActiveModeManager: add dump calls" into pi-dev
am: 8f42f8a94f

Change-Id: I319e4b2ad01b38ce63ca05e9efa76e5eb400ea8d