Merge "Round 3: Fix flakiness of testNativeCrash" am: 5757f89ddc

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

Change-Id: I5b7038ac40d723829606c8d0a76903ad104cb94b