Merge "Explicitly specify thermal throttling type" into udc-dev am: 7220f21d

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



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