Merge "Fix KeyButtonDrawable dark intensity logic error" into pi-dev
am: def169559c

Change-Id: If28cc5fbbf7912912949bcfab76f5456d28ad6d8