Revert "UBUNTU: SAUCE: arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is...

BugLink: https://bugs.launchpad.net/bugs/1713821
This reverts commit 83f3444f36eba82cca61715f793d1f6411b06e3b.

Before this patch landed upstream, a fix was added to prevent CNTVCT_EL0
accesses from going untrapped if it was reset the the user access bit set:

  https://www.spinics.net/lists/arm-kernel/msg574175.html

Let's inherit this fix by replacing with the upstream version.

Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>