Merge "Fix submenu position when showing with Gravity.END" into oc-dev
am: 883af0766a

Change-Id: Ib2799189f34cb8fc2baeb19a6a4a005eb13b64d1