Merge "AOSP/Gallery2 - Revert the sdkVersion to 28. On blueline, AOSP Gallery app wasn't able to read photo files."