Merge "[Notif] Allow locking importance on notification" into pi-dev
am: 8e7f23a74c

Change-Id: I7ddba513e0173fbaba844ea7dea61861a5f77951