Bring AlertDialog up to date with N framework

Test: all existing tests pass

Change-Id: I8fb64f443ad8e0b742e2242dec7fc50f992d6e18
13 files changed