Merge "init: Change extra_free_kbytes.sh to add margin relative to the default...

Merge "init: Change extra_free_kbytes.sh to add margin relative to the default watermark level" am: 633ce78b am: 65a9da76 am: c26e0344

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2194880



Change-Id: Id7a7fdc6afe9794b03816830de8ebc4cd80a5781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>