Merge "Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable"