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

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

Change-Id: I997b46822bd83f9c9f7dc6a02e9514a95b3758a1