Merge "Avoid NPE while drag divider bar" into sc-v2-dev am: fcfa227cf7

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

Change-Id: I3fe73e84b92c87ec6f009bc7b671d529a857820f