Merge changes from topic "unlock_jank_instrument" into sc-dev am: 924618b4

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

Change-Id: Ic6163d43bbb1a709740092012c00afff02a9b7ec