Merge "Revert 111b3a2a, "Allow short-service to hold a wake lock during doze"" into udc-dev am: 4a280931 am: d7d2057e

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



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