Merge "Refine frameworks/base/services/tests/runtest.py" am: 8bbf0181f6
am: 10623937df

Change-Id: Ie2f304039e1a2230e0f33dffc79f04529dd56180