[automerger skipped] Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs" am: 9fd7c05eb9 am: 6824b2d6ed
am: 236ae68a79 -s ours
am skip reason: change_id I5e71ea1ee1a858c0520c241dc7365733441e0f50 with SHA1 15a727439f is in history

Change-Id: I7d31ffb6afd3083dc15a00536cba92bbfb6970a3