[automerger skipped] Move common apishim classes to apishim.common pkg am:...

[automerger skipped] Move common apishim classes to apishim.common pkg am: 473501ff am: 38118b54 -s ours

am skip reason: Change-Id Ie77c17a96a67016f35890afa065bea0a07b09504 with SHA-1 473501ff is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11486021

Change-Id: Ib118a1c337d6b82857a60fd5fa64fdeaeae70b95