Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs" am: 9fd7c05eb9
am: 6824b2d6ed

Change-Id: I20361e0eeebebcf0547cb8c153262eb8e4e61ca3