Merge "Document the behavior of the --force-non-staged flag." am: 232000e8...

Merge "Document the behavior of the --force-non-staged flag." am: 232000e8 am: 4f23d7c1 am: 99bfe4ba am: df1e84e8 am: f8c116e2 am: 86376108

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



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