[automerger skipped] Merge "Split generic_no_telephony in two."

am: f1429b1c31  -s ours

Change-Id: Ibd7b64a9813ee45cfe001f307be821260c76cddc
This commit is contained in:
Anton Hansson 2018-07-11 02:59:23 -07:00 committed by android-build-merger
commit 3ca5df4c40

Diff Content Not Available