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

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



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