[automerger skipped] Add Network Preference Bitmaps am: f4a9445a52 am: 708ca65f38 -s ours
am skip reason: Change-Id I25f41ad48eb4dc74c2cace80ccec4e1e954443f9 with SHA-1 f4a9445a52 is in history
Change-Id: I069e1481157abcc856ea290cacd47ca725cfec83
This commit is contained in: