Merge "DO NOT MERGE - Check exported status in chooser am: 7bae18232e am: 45fa749c5a" into nyc-mr2-dev-plus-aosp
am: b98f76e276  -s ours

Change-Id: I16fb9bc8655f057ad431ec8ddf2ffed723c9357f