Move GrantPermissions and ReviewPermission ViewModels out of v31/33

These ViewModels were erroneously put into the v31/v33 folders. The
viewModels were added in v31 and v33, but the class is used on previous
versions.

Also add package-info.java to v31 and v33 folders

Fixes: 223418221
Fixes: 223422689
Test: build
Change-Id: Id163d9d22f3dca8ba246834320d4901693517d79