[automerger skipped] Merge "Hide capture more option for non full-screen...

[automerger skipped] Merge "Hide capture more option for non full-screen image" into main am: 58b17ced am: 004ed304 -s ours

am skip reason: skipped by mrcasey

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



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