[automerger skipped] Merge "CEC: Move finishWithCallback method to...

[automerger skipped] Merge "CEC: Move finishWithCallback method to FeatureAction" am: 26c49045 am: c44fd1ee am: 3e0fe963 -s ours

am skip reason: Change-Id Idd30ec162136c8b32e8cee1181c6e3e733aa9966 with SHA-1 b686aa5f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I869d462caac0a1145253bd63972711649c74b40d