Merge "Merge "Only change picker modes when used in dialog" into nyc-dev am:...
Merge "Merge "Only change picker modes when used in dialog" into nyc-dev am: be589463 am: 4dee63bb" into nyc-mr1-dev-plus-aosp
am: 88b1768c
* commit '88b1768c':
Change-Id: I574f23bd4f288eb40e23a5272d74c60160b3b0a7