[automerger skipped] Merge "Merge "Change CellBroadcast APIs to SystemApi" am:...

[automerger skipped] Merge "Merge "Change CellBroadcast APIs to SystemApi" am: 82454e02 am: d41a61df am: 6b79955d am: 0beff21d" into qt-qpr1-dev-plus-aosp
am: 9ff0bae0 -s ours
am skip reason: change_id Ibbb22505a80567d1c08cffe9b7a7fdbd10890abe with SHA1 657ef5a7 is in history

Change-Id: I6bfd5a8fd9f7d63d2ece8c53ee38343721edc8a7