Merge "Update clear key plugin appData to void*" into pi-dev
am: 8a21f4aaf9

Change-Id: Ifebfea86a70d1f23e4b285cc29df1c30bd5c5936