[automerger skipped] Merge "remove getEnergyUsed API in modemActivityInfo" am:...
[automerger skipped] Merge "remove getEnergyUsed API in modemActivityInfo" am: d0dd1276 am: 0cc33976 am: 60ffab55 -s ours
am skip reason: Change-Id Ie9e19e6ba15f9f2363a8622dcd78df325d81849a with SHA-1 8420c943 is in history
Change-Id: Iaa12cd65423998fc99fb20aa923246121df2e758