Merge "Flush output buffers when command is complete" into main am: d3485542 am: 2f9249f1

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



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