Remove role 'button'

Bug: 68371
Change-Id: I4d00f78788e216927a88a01dc2241f8789e3e485
Merge "Remove role 'button'"