Merge "Revert "AOSP/Gallery2 - Updated to sdkVersion 29."" am: 2c4f42c34c
am: e7a3cbbff3

Change-Id: Ib6282b7d08885eeb5fd3c4c550187f67504f36fb