Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev