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

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

Change-Id: I13eb4dc6c3a7db16e5377bd92be004a8e0b2f0e1