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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9445412f619fa8d4d0e7888a333bbdffdca013bf