Android 7.1.2 Release 30 (NHG47Q)
Ensure that NLSF cannot be negative when computing a min distance between them am: d9d5ac4027 am: 0c9f64428e am: 08bee81353 am: af7b9188dd am: 1e52f31e06 am: 77d9e761ae am: 98092cecc4 am: 910dc7b667 am: dc699bde53 am: ae7f372e44
am: 8207d6fc56

Change-Id: Ic1d97945d85962f2e75963e44ee839076bdf819c