[automerger skipped] DO NOT MERGE Adjust NotificationView bottom margin based...
[automerger skipped] DO NOT MERGE Adjust NotificationView bottom margin based on whether Keyboard is shown. am: 6073f3c5 am: b0afb25e -s ours
am skip reason: subject contains skip directive
Change-Id: I33bad8ef96cd239a602c50a340f48b8b6109cfc3