Merge "Consider long system notification sound set by user" am: 858b4d7278 am: 34f01b4d91
am: 7833dc5de2

Change-Id: Ia9bd46fd0addc6e7f9f37ff26f95c032a98788ac