Merge "Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev am: c26c98cd4a
am: c361eb7c85

Change-Id: Ia024c0a762f6fbfc7079ab35f500c8b1eef98fe6