Merge changes from topic "remove_stk_no_menu" am: f35598c66d am: 91c7a85ada

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

Change-Id: I2e858e7b1d26d242853d72f46eae8a9d3f670bcc