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: I276cdb194ce9a36b922a79ad1846d0d3830e6053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>