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

Change-Id: I2710212987e9647d23d80d972ef826dc2358c53e