Merge "Update dynamicPriv listeners on keyguard changes" into rvc-dev am: 803e933e81

Change-Id: I25d258c764f530e76070405051c24394b8f2c035