Merge "Make scheduleWatchdog oneway" into udc-qpr-dev am: 482c676e am: 58b903d7

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



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