Merge "Moving source class declaration" am: 93710811 am: 860758ea

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



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