Merge "Add jank instrumentation for occlude/unocclude/launcher unlock." into...

Merge "Add jank instrumentation for occlude/unocclude/launcher unlock." into tm-qpr-dev am: 11ffb9c8

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



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