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

Change-Id: Iba19a538ef1020c0d960cdbc92f3c4399b59bdf2