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

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

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