[automerger skipped] Merge "Add get/set PreferredNetworkTypeBitmap" am: 0beb397fa5 am: 865ce409d3
am:b30c34142c-s ours am skip reason: change_id Icbd3b2108ce8eb75e863dcf38fb8249c1e37ea91 with SHA16d8e76f08ais in history Change-Id: I622dd00eb0eed98de6001d9294e7c84ff0482363
This commit is contained in: