Merge "[DO NOT MERGE] Fix context menu position for RTL"
am: 80ae7124f5  -s ours

Change-Id: If52d9831857624890785c31689d69dd6c0f28e09