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

Change-Id: Ia080af7aea13e630ed45a27233fd1efc2f3fe1b4