Merge "Add throttlingDataId to deviceConfig" into udc-dev am: cd791d5ad2 am: 41bc87c3e1

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

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