Merge changes from topic "auto_delegator" am: 549bf76e am: 4d88872f am:...

Merge changes from topic "auto_delegator" am: 549bf76e am: 4d88872f am: a2a06c49 am: 374a907e

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



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