Merge "Added forward declaration for compilation" am: 233a5a162d am: 5eab5a8d53

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

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