Merge "Add more variations of subscription plan to the fake subscription plan list." into oc-mr1-dev
am: a20bf80aa3

Change-Id: I794aa19a079c687de5d532a710e250984ba2928a