Merge "Make more DeviceHandler member functions private" into main am: 7bbb008d57 am: 112d0b11f5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3101419

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