[automerger skipped] Merge "Change getUid before turning screen off" into pie-cts-dev am: d4486a3833 -s ours

am skip reason: Change-Id Id71f08d067d463e78a9dccb6b55dfab6c768888b with SHA-1 33d25231e5 is in history

Change-Id: I031ce86a015dc4743a6439591bbd1a54820a58c6