Merge "Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28"