Merge changes from topic "auto_delegator" am: 549bf76e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2173737



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