Merge "Add update_engine prefs dir to bugreport" am: 953dc622 am: f28e5c04 am: c700d187

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2215361



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