Merge "Use new @System API in ActivityManager to monitor screen being idle." am: 5d8a556e3e

Change-Id: Ie8e05e6a05492674929d5d012a97fbe55b66e58f