Merge changes from topic "unlock_jank_instrument" into sc-dev am: 924618b41c am: 54bbc02dda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14419588 Change-Id: I435aae563ac2b085e7f94363d1dd95214f8ae0ef
This commit is contained in: