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

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



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