Merge "Fixed the incorrect downlinkOffset and uplinkOffset values" am: bbdb25c72d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2360897

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