Merge "Watchdog:do not need add or clear operation when mMonitorQueue is empty." into main am: 601d23ac5f am: c0fd767a6e

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

Change-Id: I46d83735b477a690d46722c4f48dbcb0b14ca8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>