Merge "Support triggering confirmConfiguration() via dumpsys" into nyc-mr1-dev am: 0f53f6ffa2
am: 42202aa881

Change-Id: I3509b5f1e1536eaa727ae023d7b0af0e623ab49f