Merge "Remove Help & Feedback option from filmstrip" am: 9028b9112f am: f22e081ab9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2016695

Change-Id: I76d25acd14628ed76c901cc950a40c23ad027158