Merge "Always allow startForeground(SHORT_SERVICE) on running short FGS" into...

Merge "Always allow startForeground(SHORT_SERVICE) on running short FGS" into udc-dev am: 1c4ef38c

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



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