Merge "Ensure AlarmManager knows of IDLE state." into udc-dev am: c95d515c63 am: e39a19a15e

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

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