Merge \\"Bump ACTION_CHOOSE_PRIVATE_KEY_ALIAS broadcast to foreground\\" into nyc-mr1-dev am: f627e9c09e
am: 2a1491061d

Change-Id: I30bad0f21b35f98db769a92ea81be7be50b86186