Merge "Revert "AOSP/Gallery2 - Updated to sdkVersion 29.""