Merge "Add EXTRA_HANDOVER_FROM_PHONE_ACCOUNT." into oc-dr1-dev am: 48962fcc3b
am: 4998896d22

Change-Id: I60ba08e839f5fc4c1a27694b42dbba7ea97318a0