[automerger skipped] Update surface related api in ShortcutIno for...

[automerger skipped] Update surface related api in ShortcutIno for readability. am: b5f6bfef -s ours

am skip reason: Merged-In I493295fb6d1e780e5bfbb6feec31f7e85dc5294f with SHA-1 9c5fc884 is already in history

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



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