Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 am: f97b1decee am: 21962a65df

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: I24369fcac8ee05245a6c4486f1f59bdbb298fbbc