[automerger skipped] Merge "Tag modules for their sim card required" am: 35a4173f8f am: 2f4925137d
am:0c088c9321-s ours am skip reason: change_id Idcd35b9345be32658a1fd44027b03e5a47ff7e88 with SHA1c2b211f450is in history Change-Id: I8748466f0d4fc9f2aa9d20932bc4100693b17833
This commit is contained in: