Update the behavior to match the documentation. am: c2bc1c8399 am: 83b094214c

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

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