Merge "Allow resumed activity to turn-screen-on only when being started" into...

Merge "Allow resumed activity to turn-screen-on only when being started" into tm-qpr-dev am: 7bd505f7

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



Change-Id: I4f572ef050f563255ec5442bcb2121a5c397755c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>