Merge "Run update note task shortcut in a service if user is different" into udc-dev am: 29ddb4d3

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



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