Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"