[automerger skipped] Merge "Add profile class in SubscriptionInfo database" am: 0fa56be4c3 am: c2d548ad52
am: 00f4160cff -s ours
am skip reason: change_id I04b9d5223e20d7f8f885406e56d8e06a3d6f5975 with SHA1 970d57a89b is in history

Change-Id: I1069f578c00cba29840e042d3aaf3fbb0aab2824