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

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

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