Modify logging of button presses accoding to buttons presented.

As buttons for permission upgrade were added as part of buttons presented bitmap, we should use the same bits when those buttons are pressed.

Test: make statsd_testdrive &&./out/host/linux-x86/bin/statsd_testdrive -p com.google.android.permissioncontroller 213
Change-Id: Iac048bd106bbacfff2622cde09e4b46c52e66bed