Merge "Move FlickerTests to frameworks/base/tests 2/2"