[automerger skipped] Merge "Move data stall definitions out from Setting" am: e9a39ceb6b
am:3b4698c39c-s ours am skip reason: change_id I8e1fb5b47fff3bf624131ba1f5732daabd991e6d with SHA10b98441205is in history Change-Id: I66537498ead2d600efa38c5e7207f13d07943d8d
This commit is contained in: