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

[automerger skipped] Merge "Update surface related api in ShortcutIno for readability." into tm-dev am: 93ab8fc5 -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: I7f3016f4bfd00b231f92f4b894f43919613eeb54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>