Merge "Make the time zone test1 APEX uninstallable"
am: 8481d196d3

Change-Id: I920e0543ea8be337bd9ed221fb57199fcd5ac40a