Merge "Collapse AndroidManifest_common to default" into ub-contactsdialer-i-dev
am: 331873ba00

Change-Id: I742dbe4c9fbabdec9595cb2363791431a0212368