Also move tags to Keyguard as we need it in Keyguard. Change-Id: I718581cb4081830da1c3a2f4ad9b9f0ec6f09ae5
8c18431be8
4c18d82084