Merge "Implemented dynamic privacy for redacted lockscreens" into qt-dev
am: 07e64c8b02

Change-Id: I93a79abae7a5477c3a95cd6cab2230adeb674ca9