Improve recentering logic am: b2a87e5dc0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15645198

Change-Id: I1ff49df420b8ffdc7b0f4288e1d77a4062ba4a3e