Use bearer instead of bearer_bitmask to avoid merging APNs. am: 9b0156ea1b
am: 9fcb90ea44

Change-Id: Ibcf8060271ec60535aa30f02bf919678ae354ead