Merge "DO NOT MERGE Adjust NotificationView bottom margin based on whether Keyboard is shown." into qt-qpr1-dev
am: fd15e010ba

Change-Id: Iafb2266d9bd6f0628d8fc2ba8b0f646bab615523