[automerger skipped] Merge "CEC: Move finishWithCallback method to FeatureAction" into sc-dev am: 060b1b49 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If37ddac7c3a67bdb2b1608bd74d948e402a02f0e