Merge "Adding include to functional" into main am: b0f9c07590 am: 29d1636f84 am: 59f6265d0c

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

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