Merge "Fix system process crash" into udc-qpr-dev am: 1d9b476c76

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

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