Merge "Fix settingLib couldn't receive the broadcast issue." am: b29c718a9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895047

Change-Id: I6ac7d5b9794eef7581373003960a5009a381cd97