Merge "Add the Missing Header" am: 20db4e3d am: 410ec834 am: 06f556a5

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



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