Merge "Schedule lifecycle-stops after every transition" into tm-qpr-dev am: 8a55af9e

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



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