Merge "Moving source class declaration" am: 93710811ca

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

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