[automerger skipped] Merge changes from topic "qpr_patch_for_smart_idle" into...

[automerger skipped] Merge changes from topic "qpr_patch_for_smart_idle" into tm-qpr-dev am: 83f272a2 -s ours am: cf171f00 -s ours

am skip reason: Merged-In I97503795473a9977740e717bf7b0ef6283c65a53 with SHA-1 b2c7eede is already in history

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



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