[automerger skipped] Merge "Update sharedPreference to false when exits new...
[automerger skipped] Merge "Update sharedPreference to false when exits new device provisioning" into pi-dev
am: be52a390 -s ours
am skip reason: SHA1 be52a390 skipped by user fionaxu
Change-Id: Ibddf86a6b318c5bb545adfdc3067726973058e0d