Merge "Reports top resumed activity state loss when no focused task" into...

Merge "Reports top resumed activity state loss when no focused task" into udc-qpr-dev am: 5c8ee219 am: 209d44a7

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



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