am 4bc6158d: am baad552d: am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast

Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'

* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast