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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d54f242cee6171c8666efed21d83349366b7070