Merge "Add a force fail for non-bionic xfail test."
am: 6689b4f258

Change-Id: Ifb82b406aa125ba13040949a22a118f2c756a66a