tree 93b87f35eae66eadac9661dd6eb31b2635474076
parent 4669f306f51d7e3c9a1724aa44b10c36d1566862
parent 0c088c932115034006eeb14f62d582ee39a7dcf7
author Julien Desprez <jdesprez@google.com> 1547053923 -0800
committer android-build-merger <android-build-merger@google.com> 1547053923 -0800

[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 SHA1 c2b211f450 is in history

Change-Id: I8748466f0d4fc9f2aa9d20932bc4100693b17833