Merge "Run update note task shortcut in a service if user is different" into...

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

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



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