Merge "Logspam: Properly handle optional app widgets service" am: d85adb46 am: a9acc019

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



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