[automerger skipped] Merge "DO NOT MERGE Adjust NotificationView bottom margin...

[automerger skipped] Merge "DO NOT MERGE Adjust NotificationView bottom margin based on whether Keyboard is shown." into qt-qpr1-dev am: fd15e010 am: 8c7deb13 -s ours
am skip reason: subject contains skip directive

Change-Id: I29b0928aa80d6065f52088f1edf99a2ba98d4753