Merge changes from topic "auto_delegator" am: 549bf76e60 am: 4d88872f62

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

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