Merge "Reduce overhead of activity launch observer" into tm-dev am: e0d21194 am: d853d209 am: c2cb6cbd

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



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