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

Change-Id: Ie537f57ef151f67f8bd2f98ee7463ce95938d1c0