Merge "Revert "SYSTEM/app/Gallery2/Gallery2.apk app - update the version to target P (28) or higher."" am: 6b26017b72
am: 350c8ec39b

Change-Id: I1648a4b369ee3e65d1f6c994a521647462d1e75d