Merge changes from topic "android_dynamic_performance_framework" into sc-dev am: 080abd80f4

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

Change-Id: Ibf21c31ad66fa26a036d229ba2a58cb841f66c22