[automerger skipped] Move generic classes to com.android.storage am: a6d5c9e89b am: 3ab018db5f am: 2bfb3bb727 -s ours

am skip reason: Merged-In Ia355db224da7010dbb1534786b84f1948f1a0263 with SHA-1 b3d5d26d7d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/2841633

Change-Id: I2bf15cbea834ce326595ca64f815ba515788f7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>