Merge "Fix problem with AOD when secondary power groups are awake" into udc-dev am: 6fbe5c11 am: 54b19533

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



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