Merge "[IT4.21] Update the label type of idle timer" am: 4bdcbf4608

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5bec3e22e835d99ffa6dec818114f8e4fb88ecd