[automerger skipped] Merge "Add profile class in SubscriptionInfo database"...
[automerger skipped] Merge "Add profile class in SubscriptionInfo database" am: 82ac45cb am: 02210cb6
am: 52fe3c86 -s ours
am skip reason: change_id If1dde81a943e2a76ec50b2b3ae07d97ee5db75fd with SHA1 45c241c0 is in history
Change-Id: I44f5e14716927b8543a88350a2719ae9beba941d