Merge "Make DeviceStateController generic" into tm-qpr-dev am: 6dead15c am: d5817a77

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



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