Update felix SVN to 36 am: 6df29a10cc am: 52e1d2e397

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/25617999

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