[automerger skipped] Merge "[DO NOT MERGE] Use new PermissionChecker API...
[automerger skipped] Merge "[DO NOT MERGE] Use new PermissionChecker API change in CellBroadcastHandler"
am: eb406462 -s ours
am skip reason: change_id Ifd2cd49a360c52c90559aa18debcb806350c91bc with SHA1 8d1ab30a is in history
Change-Id: I846824e5e85bfeadcac38c955056e4073a4d94d8