[automerger skipped] Merge "increase callforward notification importance to shown in status bar" am: 3c6c238a
am: 69a8d473 -s ours
am skip reason: change_id I26ad1539ec6e2b76c03e76213e221a1d1daa7178 with SHA1 29a382c6 is in history
Change-Id: Id71edd63d7d3343f62e9e6477f48cb3c0fa5a1b2